Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Merge master to develop #4946

Merged
merged 42 commits into from
Jul 8, 2024
Merged

Conversation

kantai
Copy link
Member

@kantai kantai commented Jul 3, 2024

This merges the latest from master to develop. The conflicts were in CHANGELOG.md, and in commented out code in v1::signer

wileyj and others added 30 commits May 8, 2024 09:17
[CI] 4746 - Avoid extraneous CI runs (master)
- removed the step to , defaulting to repo root
…lot-count

Revert "Fix/signer slot count"
…onical-2.5.0.0.4

Fix: never consider Stacks chain tips that are not on the canonical burn chain #4886
* cow/arcing tuple types and refactoring some checks in analyzer
Performance improvements in Clarity analysis
* master:
  remove paths-ignore
  4746 - avoid extra ci runs
….0.4

Merge branch release/2.5.0.0.4 to master
@kantai kantai requested review from a team as code owners July 3, 2024 15:40
@wileyj
Copy link
Contributor

wileyj commented Jul 3, 2024

hmm, master could use a merge from release/2.5.0.0.5, else we'll be doing this again after that (only 2 PR's missing - one for the default antientropy_rety and another for the changelog).

better to wait on this PR until that one is merged?

@kantai
Copy link
Member Author

kantai commented Jul 3, 2024

hmm, master could use a merge from release/2.5.0.0.5, else we'll be doing this again after that (only 2 PR's missing - one for the default antientropy_rety and another for the changelog).

better to wait on this PR until that one is merged?

Yep, happy to wait on that. Will close.

@kantai kantai closed this Jul 3, 2024
@wileyj
Copy link
Contributor

wileyj commented Jul 3, 2024

#4947

@wileyj wileyj reopened this Jul 3, 2024
@kantai kantai enabled auto-merge July 4, 2024 01:42
@smcclellan smcclellan requested review from obycode and wileyj July 5, 2024 13:55
Copy link
Contributor

@obycode obycode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@kantai kantai added this pull request to the merge queue Jul 8, 2024
Merged via the queue into develop with commit 8c3bf33 Jul 8, 2024
1 check passed
@kantai kantai deleted the chore/master-to-develop-07032024 branch July 8, 2024 15:59
@blockstack-devops
Copy link
Contributor

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@stacks-network stacks-network locked as resolved and limited conversation to collaborators Oct 30, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants